home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
X User Tools
/
X User Tools (O'Reilly and Associates)(1994).ISO
/
sources
/
xwebster
/
ssol2
/
xw
Wrap
Text File
|
1994-10-02
|
14KB
|
430 lines
--- ./Xw/MenuBtnP.h.rtr Fri Sep 16 13:01:30 1988
+++ ./Xw/MenuBtnP.h Sun Sep 25 14:14:49 1994
@@ -34,9 +34,17 @@
*
********************************************/
+typedef void (*XtWidthWidgetProc)(
+#if NeedFunctionPrototypes
+ Widget, /* widget */
+ Dimension *
+#endif
+);
+
+
typedef struct _XwMenuButtonClassPart
{
- XtWidgetProc idealWidthProc;
+ XtWidthWidgetProc idealWidthProc;
XtWidgetProc unhighlightProc;
XtWidgetProc highlightProc;
XtWidgetProc setCascadeProc;
@@ -44,7 +52,7 @@
XtWidgetProc enterParentProc;
XtWidgetProc cascadeSelectProc;
XtWidgetProc cascadeUnselectProc;
- XtWidgetProc setTraversalType;
+ XtProc2 setTraversalType;
} XwMenuButtonClassPart;
#define XtInheritSetCascadeProc ((XtWidgetProc) _XtInherit)
--- ./Xw/Imakefile.rtr Sun Sep 25 12:19:03 1994
+++ ./Xw/Imakefile Sun Sep 25 14:23:17 1994
@@ -1,10 +1,12 @@
# Comment out HP_SHARED if you want to build the .a version (but why ?? :-) )
+CC=gcc -w
+#PROTO_DEFINES = -DFUNCPROTO=0
#ifdef HP_SHARED
AR = ld -b -s -o
RANLIB = /bin/mv libXw.a libXw.sl ; echo Renamed
CDEBUGFLAGS = +O3 +z
#endif
- STD_DEFINES = LibraryDefines
+ STD_DEFINES = -DSYSV
INCLUDES = -I.. -I$(TOP)
INSTALLFLAGS = $(INSTINCFLAGS)
LINTLIBS = $(LINTXLIB) $(LINTXTOOL)
--- ./Xw/XwP.h.rtr Thu Feb 23 03:06:35 1989
+++ ./Xw/XwP.h Sun Sep 25 14:16:14 1994
@@ -46,12 +46,13 @@
*
************************************************************************/
+typedef void (*XtProc2)();
typedef struct _XwPrimitiveClassPart
{
XtWidgetProc border_highlight;
XtWidgetProc border_unhighlight;
- XtWidgetProc select_proc;
- XtWidgetProc release_proc;
+ XtProc2 select_proc;
+ XtProc2 release_proc;
XtWidgetProc toggle_proc;
XtTranslations translations;
} XwPrimitiveClassPart;
@@ -318,7 +319,7 @@
***********************************************************************/
typedef struct {
- XtWidgetProc setTraversalFlag;
+ XtProc2 setTraversalFlag;
} XwMenuPaneClassPart;
/* Full class record declaration */
@@ -415,31 +416,31 @@
***********************************************************************/
typedef struct {
- XtProc attachPane;
- XtProc detachPane;
- XtProc addPane;
- XtProc setSelectAccelerator;
- XtProc clearSelectAccelerator;
- XtProc setPostMnemonic;
- XtProc clearPostMnemonic;
- XtProc addButton;
+ XtProc2 attachPane;
+ XtProc2 detachPane;
+ XtProc2 addPane;
+ XtProc2 setSelectAccelerator;
+ XtProc2 clearSelectAccelerator;
+ XtProc2 setPostMnemonic;
+ XtProc2 clearPostMnemonic;
+ XtProc2 addButton;
XwBooleanProc processSelect;
XwBooleanProc validEvent;
XwBooleanProc doICascade;
- XtProc setSelectMnemonic;
- XtProc clearSelectMnemonic;
- XtProc setTitleAttributes;
- XtProc paneManagedChildren;
- XtProc traverseLeft;
- XtProc traverseRight;
- XtProc traverseNext;
- XtProc traversePrev;
- XtProc traverseHome;
- XtProc traverseUp;
- XtProc traverseDown;
- XtProc traverseNextTop;
- XtProc btnSensitivityChanged;
- XtProc paneSensitivityChanged;
+ XtProc2 setSelectMnemonic;
+ XtProc2 clearSelectMnemonic;
+ XtProc2 setTitleAttributes;
+ XtProc2 paneManagedChildren;
+ XtProc2 traverseLeft;
+ XtProc2 traverseRight;
+ XtProc2 traverseNext;
+ XtProc2 traversePrev;
+ XtProc2 traverseHome;
+ XtProc2 traverseUp;
+ XtProc2 traverseDown;
+ XtProc2 traverseNextTop;
+ XtProc2 btnSensitivityChanged;
+ XtProc2 paneSensitivityChanged;
} XwMenuMgrClassPart;
/* Full class record declaration */
--- ./Xw/List.c.rtr Sat May 6 00:08:45 1989
+++ ./Xw/List.c Sun Sep 25 13:51:08 1994
@@ -785,7 +785,9 @@
(mom->list.InInit))
{
- (*superclass->composite_class.insert_child)(w, args, p_num_args);
+ void (*x)();
+ x=superclass->composite_class.insert_child;
+ x(w, args, p_num_args);
XtManageChild(w);
}
else
@@ -848,7 +850,11 @@
if (!mom->list.MaxHeight[k])
mom->list.MaxHeight[k] = mom->list.MaxHeight[i];
}
- (*superclass->composite_class.insert_child)(w, args, p_num_args);
+ {
+ void (*x)();
+ x=superclass->composite_class.insert_child;
+ x(w, args, p_num_args);
+ }
if (!XtIsRealized(mom->list.rcmanager))
{
@@ -962,7 +968,11 @@
* reparent it and size it.
*
****************/
- (*superclass->composite_class.insert_child)(w, args, p_num_args);
+ {
+ void (*x)();
+ x=superclass->composite_class.insert_child;
+ x(w, args, p_num_args);
+ }
w->core.parent = (Widget )mom->list.rcmanager;
if (XtIsRealized(mom))
--- ./Xw/ListRC.c.rtr Sat May 6 00:08:52 1989
+++ ./Xw/ListRC.c Sun Sep 25 13:55:39 1994
@@ -293,7 +293,11 @@
cw = (XwListRowColWidget) w->core.parent;
superclass = (XwManagerWidgetClass)XwmanagerWidgetClass;
- (*superclass->composite_class.insert_child)(w, args, p_num_args);
+ {
+ void (*x)();
+ x=superclass->composite_class.insert_child;
+ x(w, args, p_num_args);
+ }
/*****************************************************************
* IF THIS CHILD IS A SUBCLASS OF PRIMITVE (I.E., ITS ONE OF OURS)
--- ./Xw/Manager.c.rtr Tue Feb 20 00:34:55 1990
+++ ./Xw/Manager.c Sun Sep 25 13:59:51 1994
@@ -325,7 +325,11 @@
cw = (CompositeWidget) w->core.parent;
if (cw -> composite.insert_position != NULL)
- position = (*cw->composite.insert_position)(cw,args, num_argsP);
+ {
+ Cardinal (*x)();
+ x=*cw->composite.insert_position;
+ position = x(cw, args, num_argsP);
+ }
else
position = cw->composite.num_children;
@@ -908,7 +912,7 @@
{
parent->manager.active_child = NULL;
}
- XtRemoveAllCallbacks (w, XtNnextTop, w -> manager.next_top);
+ XtRemoveAllCallbacks (w, XtNnextTop);
XtFree((char *) w->manager.managed_children);
}
--- ./Xw/MenuPane.c.rtr Thu Feb 23 03:03:10 1989
+++ ./Xw/MenuPane.c Sun Sep 25 14:06:09 1994
@@ -257,7 +257,11 @@
composite = (CompositeWidgetClass)
XwmenupaneWidgetClass->core_class.superclass;
- (*(composite->composite_class.insert_child)) (w, args, num_argsP);
+ {
+ void (*x)();
+ x=composite->composite_class.insert_child;
+ x(w, args, num_argsP);
+ }
/* Call menu mgr's AddButton() procedure */
if ((parent = (Widget) XtParent(w)) &&
@@ -703,7 +707,7 @@
XtDestroyGC (mw->menu_pane.titleGC);
- XtRemoveAllCallbacks (mw, XtNselect, mw->menu_pane.select);
+ XtRemoveAllCallbacks (mw, XtNselect);
}
--- ./Xw/Primitive.c.rtr Tue Feb 20 00:35:03 1990
+++ ./Xw/Primitive.c Sun Sep 25 14:09:21 1994
@@ -79,18 +79,18 @@
static XtActionsRec actionsList[] =
{
- {"focusIn", (XtActionProc) _XwPrimitiveFocusIn},
- {"focusOut", (XtActionProc) _XwPrimitiveFocusOut},
- {"visibility", (XtActionProc) _XwPrimitiveVisibility},
- {"unmap", (XtActionProc) _XwPrimitiveUnmap},
- {"traverseLeft", (XtActionProc) _XwTraverseLeft },
- {"traverseRight", (XtActionProc) _XwTraverseRight },
- {"traverseUp", (XtActionProc) _XwTraverseUp },
- {"traverseDown", (XtActionProc) _XwTraverseDown },
- {"traverseNext", (XtActionProc) _XwTraverseNext },
- {"traversePrev", (XtActionProc) _XwTraversePrev },
- {"traverseHome", (XtActionProc) _XwTraverseHome },
- {"traverseNextTop", (XtActionProc) _XwTraverseNextTop},
+ {"focusIn", (XtProc2 ) _XwPrimitiveFocusIn},
+ {"focusOut", (XtProc2 ) _XwPrimitiveFocusOut},
+ {"visibility", (XtProc2 ) _XwPrimitiveVisibility},
+ {"unmap", (XtProc2 ) _XwPrimitiveUnmap},
+ {"traverseLeft", (XtProc2 ) _XwTraverseLeft },
+ {"traverseRight", (XtProc2 ) _XwTraverseRight },
+ {"traverseUp", (XtProc2 ) _XwTraverseUp },
+ {"traverseDown", (XtProc2 ) _XwTraverseDown },
+ {"traverseNext", (XtProc2 ) _XwTraverseNext },
+ {"traversePrev", (XtProc2 ) _XwTraversePrev },
+ {"traverseHome", (XtProc2 ) _XwTraverseHome },
+ {"traverseNextTop", (XtProc2 ) _XwTraverseNextTop},
};
@@ -484,8 +484,8 @@
{
XwManagerWidget parent;
- XtRemoveAllCallbacks (pw, XtNselect, pw -> primitive.select);
- XtRemoveAllCallbacks (pw, XtNrelease, pw -> primitive.release);
+ XtRemoveAllCallbacks (pw, XtNselect);
+ XtRemoveAllCallbacks (pw, XtNrelease);
if (pw->primitive.I_have_traversal)
XwProcessTraversal (pw, XwTRAVERSE_HOME, TRUE);
else if ((XtIsSubclass((parent = (XwManagerWidget)XtParent(pw)),
--- ./Xw/Panel.c.rtr Sat May 6 00:09:43 1989
+++ ./Xw/Panel.c Sun Sep 25 14:12:05 1994
@@ -78,7 +78,7 @@
* Matches string descriptors with internal routines.
*
*************************************<->***********************************/
-static XtActionsRec actionsList[] = NULL;
+static XtActionsRec actionsList[] = { NULL };
/* Resource definitions and defaults for Panel */
@@ -1694,7 +1694,11 @@
XwPanelWidget pw;
superclass = (XwManagerWidgetClass) XwmanagerWidgetClass;
- (*superclass->composite_class.insert_child)(w,args,n);
+ {
+ void (*x)();
+ x=superclass->composite_class.insert_child;
+ x(w, args, n);
+ }
pcp = (XwPanelConstraintRec *) w->core.constraints;
pw = (XwPanelWidget) w->core.parent;
@@ -1785,7 +1789,11 @@
}
superclass = (XwManagerWidgetClass) XwmanagerWidgetClass;
- (*superclass->composite_class.delete_child)(w,args,n);
+ {
+ void (*x)();
+ x=superclass->composite_class.delete_child;
+ x(w, args, n);
+ }
}
/*************************************<->*************************************
--- ./Xw/PopupMgrP.h.rtr Fri Sep 16 13:02:31 1988
+++ ./Xw/PopupMgrP.h Sun Sep 25 14:15:23 1994
@@ -33,7 +33,7 @@
/* New fields for the PopupMgr widget class record */
typedef struct {
- XtProc manualPost;
+ XtProc2 manualPost;
} XwPopupMgrClassPart;
/* Full class record declaration */
--- ./Xw/ScrollBar.c.rtr Thu Feb 23 03:05:08 1989
+++ ./Xw/ScrollBar.c Sun Sep 25 14:21:36 1994
@@ -626,8 +626,8 @@
XwScrollBarWidget sbw;
{
- XtRemoveAllCallbacks (sbw, XtNsliderMoved, sbw->scrollbar.slider_moved);
- XtRemoveAllCallbacks (sbw, XtNareaSelected, sbw->scrollbar.area_selected);
+ XtRemoveAllCallbacks (sbw, XtNsliderMoved);
+ XtRemoveAllCallbacks (sbw, XtNareaSelected);
}
--- ./Xw/RCManager.c.rtr Thu Feb 23 03:04:38 1989
+++ ./Xw/RCManager.c Sun Sep 25 14:18:33 1994
@@ -267,7 +267,11 @@
cw = (XwRowColWidget) w->core.parent;
superclass = (XwManagerWidgetClass)XwmanagerWidgetClass;
- (*superclass->composite_class.insert_child)(w, args, p_num_args);
+ {
+ void (*x)();
+ x=superclass->composite_class.insert_child;
+ x(w, args, p_num_args);
+ }
/*****************************************************************
* IF THIS CHILD IS A SUBCLASS OF PRIMITVE (I.E., ITS ONE OF OURS)
--- ./Xw/SWindow.c.rtr Sat May 6 00:09:09 1989
+++ ./Xw/SWindow.c Sun Sep 25 14:20:47 1994
@@ -868,7 +868,9 @@
(w == (Widget )mom->swindow.bboard) ||
(mom->swindow.InInit))
{
- (*superclass->composite_class.insert_child)(w, args, p_num_args);
+ void (*x)();
+ x=superclass->composite_class.insert_child;
+ x(w, args, p_num_args);
XtManageChild(w);
}
else
@@ -878,7 +880,11 @@
mom->swindow.bbChild = w;
w->core.parent = (Widget )mom->swindow.bboard;
XtAddCallback(w,XtNdestroyCallback,KidKilled,NULL);
- (*superclass->composite_class.insert_child)(w, args, p_num_args);
+ {
+ void (*x)();
+ x=superclass->composite_class.insert_child;
+ x(w, args, p_num_args);
+ }
if (!mom->swindow.initialY)
mom->swindow.vOrigin = abs(mom->swindow.initialY);
--- ./Xw/TitleBar.c.rtr Tue Feb 20 00:35:11 1990
+++ ./Xw/TitleBar.c Sun Sep 25 14:24:12 1994
@@ -1093,7 +1093,11 @@
XwManagerWidgetClass superclass;
superclass = (XwManagerWidgetClass) XwmanagerWidgetClass;
- (*superclass->composite_class.insert_child)(w,args,num_args);
+ {
+ void (*x)();
+ x=superclass->composite_class.insert_child;
+ x(w, args, num_args);
+ }
LinkPrecedence(w);
LinkPosition(w);
--- ./Xw/TextEditP.h.rtr Fri Sep 16 13:04:26 1988
+++ ./Xw/TextEditP.h Sun Sep 25 14:26:19 1994
@@ -88,8 +88,8 @@
typedef struct {
unsigned char* (*copy_substring)();
unsigned char* (*copy_selection)();
- XtWidgetProc unset_selection;
- XtWidgetProc set_selection;
+ XtProc2 unset_selection;
+ XtProc2 set_selection;
XwEditResult (*replace_text)();
XtWidgetProc redraw_text;
} XwTextEditClassPart;
--- ./Xw/Valuator.c.rtr Thu Feb 23 03:06:12 1989
+++ ./Xw/Valuator.c Sun Sep 25 14:25:40 1994
@@ -592,9 +592,9 @@
XtDestroyGC (vw -> valuator.slider_fill_GC);
if (vw -> valuator.pixmap != 0)
XFreePixmap (XtDisplay (vw), vw -> valuator.pixmap);
- XtRemoveAllCallbacks (vw, XtNsliderMoved, vw -> valuator.slider_moved);
- XtRemoveAllCallbacks (vw, XtNareaSelected, vw -> valuator.area_selected);
- XtRemoveAllCallbacks (vw, XtNareaSelected, vw -> valuator.slider_released);
+ XtRemoveAllCallbacks (vw, XtNsliderMoved);
+ XtRemoveAllCallbacks (vw, XtNareaSelected);
+ XtRemoveAllCallbacks (vw, XtNareaSelected);
}
--- ./Xw/SourceDsk.c.rtr Fri Sep 16 13:03:55 1988
+++ ./Xw/SourceDsk.c Sun Sep 25 14:31:41 1994
@@ -44,7 +44,7 @@
#include <Xw/TextEditP.h>
extern char *tmpnam();
-extern void bcopy();
+#define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
/** private DiskSource definitions **/